Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 3 Feb 2011 22:51:38 +0000 (14:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 3 Feb 2011 22:51:38 +0000 (14:51 -0800)

Trivial merge